gtkaccelgroup.c: Do not use GET_PRIV macro

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index a46ac68dc3edf163ee74e671bfb1b11875ad500c..b9592585b6f2f35f54805cf6d744841a768bd2a6 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -62,8 +62,6 @@
  * and mnemonics, of course.
  */
 
-#define GTK_ACCEL_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupPrivate))
-
 /* --- prototypes --- */
 static void gtk_accel_group_finalize     (GObject    *object);
 static void gtk_accel_group_get_property (GObject    *object,
@@ -228,15 +226,18 @@ gtk_accel_group_get_property (GObject    *object,
 static void
 gtk_accel_group_init (GtkAccelGroup *accel_group)
 {
-  GtkAccelGroupPrivate *priv = GTK_ACCEL_GROUP_GET_PRIVATE (accel_group);
+  GtkAccelGroupPrivate *priv;
+
+  accel_group->priv = G_TYPE_INSTANCE_GET_PRIVATE (accel_group,
+                                                   GTK_TYPE_ACCEL_GROUP,
+                                                   GtkAccelGroupPrivate);
+  priv = accel_group->priv;
 
   priv->lock_count = 0;
   priv->modifier_mask = gtk_accelerator_get_default_mod_mask ();
   priv->acceleratables = NULL;
   priv->n_accels = 0;
   priv->priv_accels = NULL;
-
-  accel_group->priv = priv;
 }
 
 /**

diff --git a/gtk/gtkaccelgroupprivate.h b/gtk/gtkaccelgroupprivate.h
index af42d13b3f77a998e3d2b59dda0529059e00de51..ab101911381f84a95c70b69bbac175d8be36237d 100644 (file)
--- a/gtk/gtkaccelgroupprivate.h
+++ b/gtk/gtkaccelgroupprivate.h
@@ -22,8 +22,6 @@
 #define __GTK_ACCEL_GROUP_PRIVATE_H__
 
 
-#define GTK_ACCEL_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupPrivate))
-
 struct _GtkAccelGroupPrivate
 {
   guint               lock_count;